From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 24 Sep 2016 18:06:00 +0000 (-0700)
Subject: Use /proc/self/cmdline on Solaris as well in shell_global_reexec_self()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~570
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ddfdfaed785e9ef4291a2bd921009a79191ff760;p=gnome-shell.git

Use /proc/self/cmdline on Solaris as well in shell_global_reexec_self()

Solaris 11.3.5 and later have a Linux-compatible implementation of
/proc/self/cmdline, so the code to use it can be enabled in gnome-shell
on Solaris - if used on an older OS, it simply fails to open the file
and returns without doing anything, just as the code did before enabling
this.

https://bugzilla.gnome.org/show_bug.cgi?id=776199

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---

diff --git a/src/shell-global.c b/src/shell-global.c
index 3f9ee8d4f..b30669412 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1258,7 +1258,7 @@ shell_global_reexec_self (ShellGlobal *global)
   GPtrArray *arr;
   gsize len;
 
-#if defined __linux__
+#if defined __linux__ || defined __sun
   char *buf;
   char *buf_p;
   char *buf_end;